Fix #149191, reported by Morten Welinder:

Tue Aug  3 18:16:55 2004  Matthias Clasen  <maclas@gmx.de>

	Fix #149191, reported by Morten Welinder:

	* gtk/gtkmain.c: Include gtkclipboard.h,
	* gtk/gtkwidget.h: Declare _gtk_widget_grab_notify, not
	_gtk_widget_emit_grab_notify.

diff --git a/ChangeLog b/ChangeLog
index 5ea56ebc8bf85b037143b4076309472fd0304df0..5939088da9f41f44ce9235897df6e7e8e6c22965 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Aug  3 18:16:55 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Fix #149191, reported by Morten Welinder:
+       
+       * gtk/gtkmain.c: Include gtkclipboard.h,
+       * gtk/gtkwidget.h: Declare _gtk_widget_grab_notify, not
+       _gtk_widget_emit_grab_notify.  
+
 Tue Aug  3 14:50:14 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkicontheme.c (add_size): Add missing parens.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5ea56ebc8bf85b037143b4076309472fd0304df0..5939088da9f41f44ce9235897df6e7e8e6c22965 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Tue Aug  3 18:16:55 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Fix #149191, reported by Morten Welinder:
+       
+       * gtk/gtkmain.c: Include gtkclipboard.h,
+       * gtk/gtkwidget.h: Declare _gtk_widget_grab_notify, not
+       _gtk_widget_emit_grab_notify.  
+
 Tue Aug  3 14:50:14 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkicontheme.c (add_size): Add missing parens.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5ea56ebc8bf85b037143b4076309472fd0304df0..5939088da9f41f44ce9235897df6e7e8e6c22965 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Tue Aug  3 18:16:55 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Fix #149191, reported by Morten Welinder:
+       
+       * gtk/gtkmain.c: Include gtkclipboard.h,
+       * gtk/gtkwidget.h: Declare _gtk_widget_grab_notify, not
+       _gtk_widget_emit_grab_notify.  
+
 Tue Aug  3 14:50:14 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkicontheme.c (add_size): Add missing parens.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5ea56ebc8bf85b037143b4076309472fd0304df0..5939088da9f41f44ce9235897df6e7e8e6c22965 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Tue Aug  3 18:16:55 2004  Matthias Clasen  <maclas@gmx.de>
+
+       Fix #149191, reported by Morten Welinder:
+       
+       * gtk/gtkmain.c: Include gtkclipboard.h,
+       * gtk/gtkwidget.h: Declare _gtk_widget_grab_notify, not
+       _gtk_widget_emit_grab_notify.  
+
 Tue Aug  3 14:50:14 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkicontheme.c (add_size): Add missing parens.

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index bcd74048103733970cfb319972c87d906df2f85f..38e77e06a5431eb997c727cf995ffed6a952e30d 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -54,6 +54,7 @@
 
 #include "gtkaccelmap.h"
 #include "gtkbox.h"
+#include "gtkclipboard.h"
 #include "gtkdnd.h"
 #include "gtkversion.h"
 #include "gtkmain.h"

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 51d29be0052fc58961e7892e177040c43f23bf5a..bd21a6e61dbcf24f3fee81227f02f8ff3b931eaf 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -775,8 +775,8 @@ void            gtk_requisition_free     (GtkRequisition       *requisition);
 #  define gtk_widget_unref gtk_object_unref
 #endif /* GTK_TRACE_OBJECTS && __GNUC__ */
 
-void              _gtk_widget_emit_grab_notify           (GtkWidget    *widget,
-                                                         gboolean      was_grabbed);
+void              _gtk_widget_grab_notify                 (GtkWidget    *widget,
+                                                          gboolean     was_grabbed);
 
 GtkWidgetAuxInfo *_gtk_widget_get_aux_info                (GtkWidget    *widget,
                                                           gboolean      create);